Squash UMS Commits [1/3]

Credits: CyanogenMod

Change-Id: I09ed8bcc053f545377f28839673eadd2b9a2b872
Merge "Squash UMS Commits [1/3]" into du44