am c81724a8: am a1fbf8f3: Reconcile with ics-mr1-release

* commit 'c81724a8d928749d8394a4ad7e1d5f6367320d3a':