Remove use of random uuid from unit tests

Closes-Bug: #1340015
Change-Id: I07eb638fc2e11c136cbd124538a5dd7ea6120978
Merge "Remove use of random uuid from unit tests"