am dd64082e: Reconcile with ics-mr1-release

* commit 'dd64082eb6a4ce03773f271329bd10a6f582b80e':