am 0e2c2f39: Reconcile with ics-mr0-release

* commit '0e2c2f3971eb4b246a5c1b198370e003668f53ee':