am 2c4ae162: am 3ffc2889: Merge "Remove dependencies on FloatMath"

* commit '2c4ae1627617ffc5ba1662ff778f71c9de2e03b7':