Squash UMS Commits [2/3]

Credits: CyanogenMod

Change-Id: I9a57e993af4b216926dcb1c8d19a65a8f1646159

Conflicts:
	res/values/strings.xml