[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646 am: 7858a1bf96 am: 6206713fe8
am: 225fcd51d5 -s ours
am skip reason: subject contains skip directive
Change-Id: I5a783bed03769e0e2b316b92515bb6aa54e2b7f1
This commit is contained in: