Merge "Fix encryption strings" into lmp-dev