am 3ac76d1b: Reconcile with ics-mr1-release

* commit '3ac76d1bad7977e0130d70fcb2b9e046e0839476':