am 2ddd7b3e: Reconcile with ics-mr1-release

* commit '2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853':