Synced to CM msms8960

Change-Id: Iea51e0df8d978b317b0e09d32efa3e23bb72427d