[automerger skipped] DO NOT MERGE: Fix bug in random.
am: 01ed1e9c7b -s ours
am skip reason: subject contains skip directive

Change-Id: I4cb1a4848ba0f07eef10dde43161bad22152ffc1