AOSP_KK4.4: Sync with CM

Change-Id: I25a36f061a6874a07fcae109317b50041ec59671