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

Change-Id: I0061906fac6dfb20879512df58a33e20ecaa62d4