Reconcile with ics-mr1-release

Change-Id: I13d2f8f34dec84ac0cf8296e3e10e9f33c88cc40