Revert "Fix random underflow. am: 448cff811f"
am: a93e63f54e

Change-Id: Ia9b582312edc25eedcfcbf8f7ca94fa91f5b92c2