am e0a3b19f: am f66c8d36: Merge "Remove usages of FloatMath"

* commit 'e0a3b19ffbd69b4401724477d346dc1494bad04a':
  Remove usages of FloatMath