Reconcile with AOSP

Change-Id: I830f8749f3a1154edf39f2754bf2a845fc9060c3