Reconcile with ics-mr1-release

Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e