am e7c845a3: Merge "Fix int -> float conversion warning."

* commit 'e7c845a3efb3b27e03d48245b3815b16af46e198':
  Fix int -> float conversion warning.