am c071d874: am 37d6d98f: Reconcile with ics-mr1-release

* commit 'c071d874386564832ba0b4a87242fb786f96764c':