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