Reconcile with ics-mr1-release

Change-Id: I35b4514a4521d9fb83fb9298048ffe0f7924d608