am 641a5624: Reconcile with ics-mr0-release

* commit '641a5624075ee942b85b17646b57f65377567a06':