am c5765b54: am 9a2c5443: Reconcile with ics-mr1-release

* commit 'c5765b5497a49f665f50e62107cbea029954d490':