[automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: 8449105f92 am: acd0f55f5a -s ours
am: 6a7b102d0d -s ours
am skip reason: subject contains skip directive
Change-Id: I6f1ff483a1840c10f316143a0fd3444a03140e77
This commit is contained in: