Reconcile with ics-mr1-release

Change-Id: I3f6da4c538fdb160bed6228d1d57026c7e9c12eb