Reconcile with AOSP

Change-Id: Ib9897b407dc84382a45ab2f0289caac881caba91