am 1889bb49: Reconcile with ics-mr0-release

* commit '1889bb49a411cf79dd6ccd162bcddb13bd2567bb':