am 1f85f1dc: Merge "Remove unreliable effect tests." into ics-mr1

* commit '1f85f1dc6ebe3c79ce753f0f9c2f9fa7f29f493d':
  Remove unreliable effect tests.