Reconcile with ics-mr0-release

Change-Id: Ide415fc461dfd7d5899b51cb07f380e9ca95ed6b