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

Change-Id: I66f84f3c322203999a2876f378cb3ced526215ea