am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"

* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
  Removing some more FloatMath references