Merge "Float.NaN != ... always evaluates to true, use Float.isNaN."
am: c09248b

* commit 'c09248bd12db1e84b9fbfd0e47cf2ed6a85c1f65':
  Float.NaN != ... always evaluates to true, use Float.isNaN.