Sync with CM

Change-Id: Id3608cc7df471faf0c078f0fdbd2b6c38e5ed348
AOSP_KK4.4: Sync with CM

Change-Id: I5dcd05990f1616bf79899c28f8b4ae06e135fa31