Merge "Remove FloatMath methods" into mnc-dev