[automerger skipped] DO NOT MERGE: Fix bug in random. am: 4151c1e35a am: 8449105f92 am: acd0f55f5a -s ours am: 6a7b102d0d -s ours am: 26b83d7bb1 am: 2627678ada am: ade0433e9a
am: dc10b29ea3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib020928e5a8d63c22098b0e6316fdffc2b10e9ad