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

* commit '3e5a75dc8fea6ee8f798b870c17e81eff418b688':
  Point fixes after OSR change.