am d7176fd5: Reconcile with ics-mr1-release
The Android Open Source Project authored
* commit 'd7176fd5':
2973021d