Reconcile with ics-mr1-release

Change-Id: Idb595648ee6ea6cb5f690f554d40f458902f65ac