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

Change-Id: Ic00c1a01c111dd32c124f74b17ecb242db3e87b0