am 138fee43: am 3ffc2889: Merge "Remove dependencies on FloatMath"

* commit '138fee43f8651ddce3c82638c4af86de043261ec':
  Remove dependencies on FloatMath