Reconcile with ics-mr0-release

Change-Id: Ief57a18b44889bbdfb1bd7bd7c379f49b2f126b8