Reconcile with AOSP

Change-Id: I1eb354b417c3e1c990cc9c35ae8981f949f8d916