am 3efc82a6: Reconcile with ics-mr1-release

* commit '3efc82a604951e062e3dd32893280042d6def78b':