am 09d695d7: am 44eae4c7: Reconcile with ics-mr1-release

* commit '09d695d782007f45504841c1535e53ccf2059a68':