Reconcile with ics-mr1-release
The Android Open Source Project authored
Change-Id: Ifb9dad264079f0a566dd978dd56414fbaf59b9e0
af9565aa