am 17654593: Reconcile with ics-mr1-release

* commit '176545930d60a366734bbf70c3b60332a606c01e':