am b4dfd2b9: Reconcile with ics-mr1-release

* commit 'b4dfd2b9ebb2fbd3345e46c26c1b5ff489e79b39':