am e1e02a51: Reconcile with ics-mr1-release

* commit 'e1e02a51b1de3211ba47bc5ffbe52e9c358f06b3':