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

Change-Id: I002b3954932af2c13b81b6f5d2e46b157f730e1e