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

Change-Id: If613847830b9fc820838e685ba2e57dadaae0765