Reconcile with AOSP

Change-Id: I147da3a9ba69aad6402b4c40615ab7b871e78c95