[automerger skipped] DO NOT MERGE: Fix bug in random. am: 188246de28 -s ours
am: f7c9cee159 -s ours
am skip reason: subject contains skip directive
Change-Id: I1f741eee132b134939cee8a66f5558d9be4af7f8
This commit is contained in: