am f1340f18: Merge "Remove dependencies on FloatMath"

* commit 'f1340f1810464ec656262141326c87b3896a3550':
  Remove dependencies on FloatMath