am a7c86fc5: am 15fc0e5f: Reconcile with ics-mr1-release

* commit 'a7c86fc53dd15b79dbe6304d7bbb405169e33349':