Reconcile with ics-mr0-release ics-mr1-release

Change-Id: Iae56ea78356ba37857e0355fee2846f7eaacac28