[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours am: f7c9cee159 -s ours am: 5d8e33dc3b
am: abb6e0eaea

Change-Id: I58ae41b7f088068cebd863aab5b3868bb7b302fe