am 43cbecd3: Reconcile with ics-mr1-release

* commit '43cbecd310642f941079b999f717653d6ab1a06e':