am 1800a2f2: am 790c9ce6: Reconcile with ics-mr1-release

* commit '1800a2f2d816a9c0b58f6ebb468e76d9d1911c8e':