Squash UMS Commits [2/3]

Credits: CyanogenMod

Change-Id: Ieb2a7c0e125c7ca7a5751a2ebd1c02eb92cef2bb