Merge \\"Clean up ex-users in lock settings db\\" into nyc-dev am: 8cbe1a6309
am: 821f3b7bf7

Change-Id: I4e922238832a6b7fe81ccc6bf05b107595ac836f