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

Change-Id: Icae4b962a39be27bbf20e9367471d167df14e207