am 557ec3e8: Reconcile with ics-mr0-release

* commit '557ec3e82ca827ec7e6463865acc6aec70ddc9f8':