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

Change-Id: I5618654152d90dfa5c77c0b5bde7ab3432c4dd46