Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev