am ef725e83: am eae6c997: Reconcile with ics-mr0-release

* commit 'ef725e83acce5fc7904a5a47aac501fc0e8ea3c6':