Reconcile with ics-mr1-release

Change-Id: Ic3929ce76f0785680588a74e81a65b55cdbad8e4