am 15760159: Merge change 5413 into donut

Merge commit '157601594fc7139a45ec43a860d36ee0045d0333'

* commit '157601594fc7139a45ec43a860d36ee0045d0333':
  Need to write the correct float math.