Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
am: 6cea122bfc

Change-Id: Iba84fbd3eedd674fa038fa515dba507d2c4b9e0e