Fix random underflow. am: 448cff811f
am: 4e9b9d342a

Change-Id: If0f734b034f9e4c8996e2e38c5050b7e43f05a19