am c2d5944e: Reconcile with ics-mr1-release

* commit 'c2d5944e19863bb2d831b13893a3bb78e0d53783':