Merge "Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am: 810c312a am: 86271b57" into oc-mr1-dev-plus-aosp