am 70b0d157: am 0f03bad3: Reconcile with ics-mr1-release

* commit '70b0d157985cd47e858ae515f235bac779338440':