am 7db22c1b: Reconcile with ics-mr1-release

* commit '7db22c1b29bdd0defc59ab8f0396b3c9614c035e':