am 9c2d6591: am c91e3d47: Reconcile with ics-mr1-release

* commit '9c2d659130f57082adafa9c0a86d308cb4fff6e7':