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

Change-Id: Ie21b020496bc5c638da4ea838583ca0956b41b6e