am 0975d53f: Reconcile with ics-mr1-release

* commit '0975d53f17d90fa9642f0f4f8222977ce5911d80':