AOSP: Sync with CM-10.2

Change-Id: Ib1c2caa00c62ccdc50750e2f2abb9f703b9b0bc9