am e5d4521f: Reconcile with ics-mr1-release

* commit 'e5d4521faae813fcfc2fb0e09199aaec0c337bb0':