am c30fdda0: Reconcile with ics-mr1-release

* commit 'c30fdda052e82ca7b014b9817945e465cca78c75':