am 95347088: Reconcile with ics-mr1-release

* commit '95347088de3f7a95efdbb742e2a703ecd0e9e852':