am e2bdc1ec: am ae4a0b92: Reconcile with ics-mr1-release

* commit 'e2bdc1ec3385bbb21f4ff9ba9e769d328a8ed9b7':