am 618cae95: am 597fe138: Merge "Remove dependencies on FloatMath"

* commit '618cae955e32fd4d7ede9a3e979e68ca8d663f15':