Fix random underflow. am: 448cff811f am: 4e9b9d342a am: 88af50ebd3
am: d643686326

Change-Id: I5f34e5ced62619882a278130cf3655812ee5c68a