am 4dce40c4: Reconcile with ics-mr1-release

* commit '4dce40c4138df3c2a6e488012401cd5ea8937d46':