Ensure that uuid is returned with mocked instance

Fixes bug 1204798

Change-Id: Icf8f1f63be4b7492ef3f788836db2c0d23477567
Merge "Ensure that uuid is returned with mocked instance"