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