Merge "Change decryption strings" into lmp-dev