Reconcile with AOSP

Change-Id: If7617609a79610762b14dca30b336180e1829ef5