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