am a5cbeea5: am 2e88f403: Reconcile with ics-mr1-release

* commit 'a5cbeea5a17ce18e93edcdd8cac92d105cc1a19d':