Merge "Add one type cast to silence the new -Wimplicit-int-float-conversion warning." am: fafe9eba3f am: 98bf1f50a4
am: aeec9cdcc0

Change-Id: I84854ec4ec32f63938894a0801379b82e19e0516