Merge CM

CyanogenMod/android_frameworks_base@74fbf2e5ee91e90d8e3df017b463cbd49d34b290

Signed-off-by: Arnav Gosain <nolinuxnoparty@gmail.com>