am 3945f475: Reconcile with ics-mr1-release

* commit '3945f4759f85bf5e9b48935273867a9d5d38f039':