am 2ca72c70: Reconcile with ics-mr1-release

* commit '2ca72c704e7462c56f8c4489369b618872b595a0':