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

* commit '29923a44e65d97b211484f6667c3155bfc396ec9':
  Remove dependencies on FloatMath