am 6815d49c: Reconcile with ics-mr1-release

* commit '6815d49cfa1ee74ffc8e9640e42d0fd1a7592286':