AOSP_CM: Sync

Change-Id: I18414b04301865cf75b27c55feb5429e14bf74f9