[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours am: f7c9cee159 -s ours am: 5d8e33dc3b am: abb6e0eaea
am: f88480735b
Change-Id: Ie689be53f3b7d96af2abb82be073f5debf59bab5
This commit is contained in: