am 8d8c81c2: Reconcile with ics-mr1-release

* commit '8d8c81c2376ef84c3e2fe4f4aecfd221072c984c':