Merge "Re-enable OSR."
am: 5960a3f430

* commit '5960a3f430d1e7f47ea3db9a8364dc82e3f8add9':
  Re-enable OSR.