am d80cd803: Merge "Fix rounding error" into gb-ub-photos-denali

* commit 'd80cd80371540af0bc44245bdee330a8f32647f3':
  Fix rounding error