Merge "Remove dependencies on FloatMath"