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

Change-Id: Ida86b2e9f68683c88db24bcbb16eaf14ce8f2d94