am 95e1d3c2: Reconcile with ics-mr1-release

* commit '95e1d3c2ee23b6fa82ce94e04c93af8b393cd029':