am e8e95757: am 9bb6dd28: Reconcile with ics-mr1-release

* commit 'e8e957575c0d96e9fb0544f3851ca42e592a960d':