Reconcile with ics-mr1-release

Change-Id: I866cdfbee1fcdf144c850566d682c69e39fa04d7