am 2e40a882: Reconcile with ics-mr1-release

* commit '2e40a8828af426362b693b59ec3cf5863fb6b419':