Reconcile with AOSP

Change-Id: Idad87247d9cad32a65ec1a3e49bffdb8a13cab74