Reconcile with ics-mr1-release

Change-Id: Ib051a1b701b6c79508d14f3014a34739cc5e244f