Reconcile with ics-mr1-release

Change-Id: Ic5558be740f41bea77be44b65f3da9dc490d9948