Revert "Revert "Fix random underflow. am: 448cff811f" am: a93e63f54e"

Bug: 63335997

This reverts commit d73520732332edd85ae625ef41d3eb670e65f328.

Change-Id: I2ba68bd77ae24d591ade203541b354be30a9c2b3
1 file changed