Merge "Disable osr while investigating flakiness."
am: e003beb849

* commit 'e003beb849386236c1fe6e5edea6aaf5f58b7919':
  Disable osr while investigating flakiness.