Merge "Point fixes after OSR change."
am: 74472a8eea

* commit '74472a8eea93bbe67aebed24a1fd5163a37a20dc':
  Point fixes after OSR change.