Merge "Relax requirement for instrumentation test runners." into idea133
 Auto-merge: 0c5d08d

* commit '0c5d08da8a14a3ec54578270036012829de97ef2':
  Relax requirement for instrumentation test runners.