AOSP: sync with CM

Change-Id: Ic557631ce2d7d0fcdaabb2bc55e569198e493618