Merge "Remove code introduced by mistake in MR0" into ics-mr0