Reconcile with ics-mr0-release

Change-Id: I467dc2efe407841e1888b440e5e0abe1cffaed0d