am b6f94723: Reconcile with ics-mr1-release

* commit 'b6f947238f459be80a9327890992c32bc89b5674':