am 6dee1a9d: Reconcile with ics-mr0-release

* commit '6dee1a9d046458134fb019669b5ffe7911dcdb29':