Merge "Fix -Wdouble-promotion warnings"
am: 7920557287

Change-Id: I2b7a8f6c24990220f90cb3d2f9221228ec330be5