Merge "Replace test UUIDs with dummy strings"