Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc am: 207bb2947e
am: 6b72c17434
Change-Id: I8ab6ad5ace2b737bfb9e68cc350aa45dbc836d01
This commit is contained in: