Reconcile with ics-mr0-release
The Android Open Source Project authored
Change-Id: I2830087ea18f09de5551bc3818a9b8633e662ada
557ec3e8