Reconcile with ics-mr0-release

Change-Id: Ib407f4380aa75f135f5a3f4d666ce2ff31343537