AOSP-KK4.4: Sync with CM

Change-Id: I43251260d4d1f6623577c76dee2a13a47e237790