am bf4ace98: am e5d4521f: Reconcile with ics-mr1-release

* commit 'bf4ace987a2cc9639d26046632106aff96ff64b4':