am 267bccfc: (-s ours) Merge "Remove code introduced by mistake in MR0" into ics-mr0

* commit '267bccfc197cdb2eaa44a0a96c8138863d1cc0bc':
  Remove code introduced by mistake in MR0