am 3ffc2889: Merge "Remove dependencies on FloatMath"

* commit '3ffc28897d40524e0b8869aebccc8b04551ba5cf':
  Remove dependencies on FloatMath