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