am e1d6fcd8: Reconcile with ics-mr1-release

* commit 'e1d6fcd8ea172e239ef7397feeb0a393aad93556':