am 40a6d4af: Merge "Cleanups in geometry_utils.h" into jb-mr1-dev

* commit '40a6d4af2a454323601c2c5ff8d95863eefedd86':
  Cleanups in geometry_utils.h