am c3cf026f: Reconcile with ics-mr1-release

* commit 'c3cf026f65d36c8c0e5d64b93127969e06be1627':