am 9fc3e3c8: Reconcile with ics-mr1-release

* commit '9fc3e3c8a6a5f2f82d5712805e90a9c89f914efa':