am afe287f9: Reconcile with ics-mr1-release

* commit 'afe287f9ce042241da7a8b88b5e4134555fcbc10':