am e8b0e7d3: Reconcile with ics-mr1-release

* commit 'e8b0e7d3f4432284975d2fcfd80efa5d6f9b50ea':