am 79ec613a: Reconcile with ics-mr1-release

* commit '79ec613a66b71a16591bcd3bde5cb815f1a3d352':