am c3307f7b: am 230d4c23: Reconcile with ics-mr1-release

* commit 'c3307f7b61ae37aa26a05b37604a04c9c2e47f19':