am d832bec4: Merge "Step 26-A Cleanup geometory_utils" into jb-mr1-dev

* commit 'd832bec40be958a55a422a5c3a69c2504ef78a4e':
  Step 26-A Cleanup geometory_utils