Reconcile with ics-mr1-release

Change-Id: I626c1244f5c6c6c813dc2d607b844287bdbbdccc