Reconcile with ics-mr1-release

Change-Id: Idc7bbf210376184867a6265475e34967c00b1315