Merge "Follow-up to OSR change."
am: 7eca244e79

* commit '7eca244e79480f2ecea341598524a53273959c2b':
  Follow-up to OSR change.