am 02ea5c79: Reconcile with ics-mr1-release

* commit '02ea5c79fa6295020cd7fc0e6420164e39dac37f':