am c996fdc8: Reconcile with ics-mr1-release

* commit 'c996fdc80a165d23291f2080b77b801294de944a':