am 0cc3f31e: am 804865e7: Reconcile with ics-mr1-release

* commit '0cc3f31e1eeb13c64400941cae6541373c9e2605':