Merge "Fix -Wdouble-promotion warnings" am: 7920557287 am: f2528e2dad am: c05e232ee8
am: 62b3f36949  -s ours

Change-Id: I21afd8f781eda6c8114870bffda4613f31688acd