am af0d8cea: am c3307f7b: am 230d4c23: Reconcile with ics-mr1-release

* commit 'af0d8cea311d527aaf7e5f014b1c864fee6b882d':