am 7e4aa24c: Reconcile with ics-mr1-release

* commit '7e4aa24c8701381f542a324df958907194285fdc':