AOSP: Sync with CM-10.2

Change-Id: I5b110a7a0ed4d31293e1b8bbecef2b60a1378923