am b0229280: Reconcile with ics-mr1-release

* commit 'b0229280c50cfad0e251c6d3c1efa77392f0f9ce':