am 3f3afbef: Reconcile with ics-mr1-release

* commit '3f3afbef0fc7c4199bb7d992dc52efaa6db1b91a':