am 98e5d57a: Reconcile with ics-mr1-release

* commit '98e5d57aa95640f5e6ee282067cc994f3ea4dd46':