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

Change-Id: I97a70eafc6e6657b8d0f87a134c17499d66ccc77