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

* commit '5bb0152da4447e94bc3859092f4d0f8c3642e30e':