[automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: 8449105f92 am: acd0f55f5a -s ours am: 6a7b102d0d -s ours
am: 26b83d7bb1

Change-Id: I82b55f5e129679fac16720c7c6e41fed43030422