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

* commit '1920869ec1aa91f31fcfddce2c40d97e397035ec':