am f0f03883: am a76cba57: Reconcile with ics-mr1-release

* commit 'f0f03883cb747cb6ca6c29be0fbc045e37a26993':