am bc72e4e1: am 13222534: (-s ours) am aeb663b9: Merge "DO NOT MERGE Add test to check for duplicate random output" into jb-dev * commit 'bc72e4e1': DO NOT MERGE Add test to check for duplicate random output