am b2a0ea35: Reconcile with ics-mr1-release

* commit 'b2a0ea3541191318a8810cef63a2d2b7d9566e4e':