am b7d0b81a: Reconcile with ics-mr1-release

* commit 'b7d0b81a616b83dd637bf97b84f96b02ac020b2c':