Reconcile with ics-mr0-release

Change-Id: I6997b52967863156cd151e368e891b63024ebbb1