am 3904034d: Reconcile with ics-mr1-release

* commit '3904034df7159db16017b6a40f46a878a73fc097':