am 96859329: Reconcile with ics-mr1-release

* commit '96859329d3f9a7a1c9834810e16747e205ea16c7':