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