am d8424130: am 597fe138: Merge "Remove dependencies on FloatMath"

* commit 'd8424130792dccacab1f642f15bd62690b68d989':
  Remove dependencies on FloatMath