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

Change-Id: Ic9efe4849e9b88e2340ff8fb4fa57cc8ed3388d6