Replace GUID with generated password

Change-Id: Id17f60db4df7188ec79faddc25453159a4f65fba
Closes-Bug: #1227913
Merge "Replace GUID with generated password"