Merge "Remove usages of FloatMath"
automerge: a8e8cdb

* commit 'a8e8cdbb17164c0124e04c376110637af96d5e89':
  Remove usages of FloatMath