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