Reconcile with ics-mr1-release

Change-Id: I12fde5c743386ec8c9106aed77e46b1a19c2aade