Reconcile with ics-mr0-release

Change-Id: Icbaedae6eb7d861d2b240a636a8f1f173e891cd4