Merge "Re-enable OSR."
am: 707954befd

* commit '707954befd63af9d970cc3f697dd9bfbdcbcf37b':
  Re-enable OSR.