Merge "Add one type cast to silence the new -Wimplicit-int-float-conversion warning."