Reconcile with ics-mr0-release

Change-Id: Ia63e8c8aeb264f65bafe4ba2ee4d9fdab9208b34