Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791
am: e05ef08a8e
-s ours am: 6496c3757b
-s ours am: 00266d056c
-s ours
am: 17bb961066
-s ours
Change-Id: I650ce37d934f2ca30f5d5bd3122593f0c4553b50
This commit is contained in: