Fix random underflow. am: 448cff811f am: 6cc4b74662 am: 45b9b0f7d7
am: 5277b0edd4

Change-Id: I27c8ab523a91abb4147ebb5b35d37dfc2041dc50