am d58f3d2b: Reconcile with ics-mr1-release

* commit 'd58f3d2bc47015f7a55b88ff56850b9990689e22':