[automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646 am: 7858a1bf96
am: 6206713fe8
Change-Id: I8579b9be0f51a639d1356fe9b4071a49c213d588
This commit is contained in: