am 3921c68a: Reconcile with ics-mr1-release

* commit '3921c68a200bb91e12f79182ded8a5546e26b7fe':