am 9ebad5e3: Reconcile with ics-mr1-release

* commit '9ebad5e35ba8c8fa452cfae39e4d88c50560c0e3':