Cherry-pick derp fix

	modified:   res/values/cm_arrays.xml
	modified:   res/values/cm_strings.xml

Change-Id: I38b9b1aebb5097b31399acc1825692e0fb5d46e7