am e3e777f7: Reconcile with ics-mr1-release

* commit 'e3e777f7f208e6b88816225b5a1d33cfc59a2221':