am 88f46420: Reconcile with ics-mr1-release

* commit '88f4642092e394631ea6e749130fc09286265970':