Merge "Revert "Fix random underflow."" into oc-dev am: 9b3d009518 am: 5111a90a92
am: d0a0c237c4

Change-Id: I44ffa2b72b1e245eaf7174d1fce0f94a2d17cf76