am 9a2c5443: Reconcile with ics-mr1-release

* commit '9a2c54432e9740c8ee902f0f7c385283866c284c':