am a5c36e43: am 43cbecd3: Reconcile with ics-mr1-release

* commit 'a5c36e43a0d7633a7e9ec708f600d1ce2c62f18f':