Reconcile with ics-mr1-release am: ad8c5483de am: f540614bbb

Original change: undetermined

Change-Id: Icae32c0e0808f0f5842e485f0129d346f3bacfd1