am 95e70959: am 3a1e624a: Reconcile with ics-mr1-release

* commit '95e709593524b029c2f89c355b6dc552764724b4':