am 29329726: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"

* commit '29329726c3b30991378b9d5e376db57a572ede38':