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

Change-Id: Ib7ea291e33776066f9a72d707d2b16153227f864