am da296533: Reconcile with ics-mr1-release

* commit 'da29653305f299d6390492333a6360cfa78665d9':