Reconcile with AOSP master

Change-Id: Iea070addca8bfff4daa4b216838b2f0582ddfc69