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

Change-Id: I4518f7a6317d3c01e37a47b19dee653ccff71502