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

Change-Id: Iaf46f1adf903571d69df45c13be5061ee134e53e