[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
am: ade0433e9a

Change-Id: I125098c30e67d1fe7df111fdf690faf0198ec2f5