AOSP: Sync with CM

Change-Id: I94a12efabd4d4651dae544f7df73383300fee195