AOSP_CM: Sync with upstream

Change-Id: I507b5ec65cfb8a3791545e8033a67f20e920d13e