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