am ecf025c0: Reconcile with ics-mr1-release

* commit 'ecf025c0980230e6f925ce8ddcf8965ed17531af':