am 9a38c83e: Reconcile with ics-mr1-release

* commit '9a38c83e1757dfb33f4593243267baa938339593':