Merge "Revert "Revert "Revert "Fix random underflow. am: 448cff811f" am: a93e63f54e""" into oc-mr1-dev