am f57689a2: Reconcile with ics-mr1-release

* commit 'f57689a2875c5834e583d269149555f87eb69629':