am e113e793: Reconcile with ics-mr1-release

* commit 'e113e793b32ca4c7fe41de41c40a34c494b4c783':