AOSP_ALL: Sync with CM

Change-Id: I7082744d6187493036c923ad5b49a3bec39a4b56