AOSP: Sync with CM (100% stock)

Change-Id: I460f47d0145e5c7610e3788c44490dddac330790