am 8ea62df2: am d0d7086f: Reconcile with ics-mr1-release

* commit '8ea62df2e67e9c0996bd000a3f3dd256bb5c0954':