am 546dc10c: Reconcile with ics-mr1-release

* commit '546dc10c1a7c6fb348507899d3629af01b4e4c43':