am 5e5fadd6: Reconcile with ics-mr1-release

* commit '5e5fadd6fa09adfb274a76587c03b2fd5eceb080':