am f66c8d36: Merge "Remove usages of FloatMath"

* commit 'f66c8d36ed081d901e495b904965e8f341ed47de':
  Remove usages of FloatMath