am 58d5e348: am 6185026e: am aeb413bc: am 94d1be18: resolved conflicts for merge of 007d20e1 to jb-mr1-dev * commit '58d5e348': DO NOT MERGE fix cherrypick of Add test to check for duplicate random output