Squash UMS Commits [3/3]

Change-Id: I6ef62640e9c6323f6cf940d9f63bd372e9e29b9d
Credits: CyanogenMod

Conflicts:
	VolumeManager.cpp