am e167320d: Reconcile with ics-mr1-release

* commit 'e167320d94d5a43719ca2fee72c085719a50cbd0':