am 9ae0b5a2: am b2a0ea35: Reconcile with ics-mr1-release

* commit '9ae0b5a23d8bc010589e77d29926b55903f3a31e':