am 27239099: Reconcile with ics-mr0-release

* commit '2723909903b68db016666a13ec897581a8915636':