[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646
am: 7858a1bf96
Change-Id: I8a98e392b16e8adf845a79e08cb440ef09900d5e
This commit is contained in: