am b9d29a72: Reconcile with ics-mr1-release

* commit 'b9d29a72d45140b7d04b2e2cb0ddb0a7df9aee6b':