am 2db72dd0: am a2c97865: am 5f7feeff: am ecdf0299: (-s ours) am 5cbd4601: Merge "Revert "DO NOT MERGE Add test to check for duplicate random output"" into jb-dev

* commit '2db72dd0cdb59550dc030ff875e5e6672cd1bf56':
  Revert "DO NOT MERGE Add test to check for duplicate random output"