am 5225c6fb: Reconcile with ics-mr1-release

* commit '5225c6fb52c1628f8bd014c3c9a0c2b87f192dab':