am 001bb6f8: am 27239099: Reconcile with ics-mr0-release

* commit '001bb6f8caf0bbdecfb1606a710c7c85b97151db':