AOSP: Sync with CM-10.2

Change-Id: I507eb38043508c9cfe54f739d484bbbae469181d