Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev