Reconcile with AOSP

Change-Id: I3d9b7538e774bde6b5373c7d439bb0629615e0ed