Merge "Use the right message for pattern/password." into lmp-mr1-dev