am efa49439: am 4f306bec: Reconcile with ics-mr1-release

* commit 'efa4943952f81a5cb5a5d410cc4b53ca665d7065':