am d49a56ce: am 1889bb49: Reconcile with ics-mr0-release

* commit 'd49a56ce6405021b84ad4616f31d03f97732128c':