am 7ec0076b: Reconcile with ics-mr0-release

* commit '7ec0076b96bf02ff1ae6521c52d14d9a8621b100':