am f8e58c8b: Reconcile with ics-mr1-release

* commit 'f8e58c8b4e8e2ef84e7213401ab595ce084f5612':