Reconcile with ics-mr1-release

Change-Id: I62bace5c4272d043a51d3f0f698556716838aa51