am e93b5221: Reconcile with ics-mr1-release

* commit 'e93b5221c0f201345ee78f0fbd94c36f4fb00490':