Reconcile with AOSP master

Change-Id: I01bd9c391b6adaabbad233b308c5dbecfd9f2827