Reconcile with AOSP

Change-Id: I0e676eea79b1f31708bf770e9585f11647b752ac