am bb712edd: Reconcile with ics-mr1-release

* commit 'bb712edde58d3b4069bb7f1f63895522ce651579':