am caf0e6aa: Reconcile with ics-mr1-release

* commit 'caf0e6aab57fe5e25fabc2aa485f44770678c816':