am 2e88f403: Reconcile with ics-mr1-release

* commit '2e88f403fa68a84bc7a9952ed24d6c200d02335c':