am afe8c548: am d49a56ce: am 1889bb49: Reconcile with ics-mr0-release

* commit 'afe8c548e5d6cbd132498816002c1c01dd45a0f5':