Change 'secrete' and 'secret' (used as password) to 'secretsecret'

Change-Id: I792fecff0c885bc14cda313ff15ea213adc49432
Partial-Bug: #1372639
Merge "Change 'secrete' and 'secret' (used as password) to 'secretsecret'"