am a6e8e0d8: Merge "Remove dependencies on FloatMath"

* commit 'a6e8e0d8fbb38398884fd5c5cc0d42431070e031':
  Remove dependencies on FloatMath