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

Change-Id: I461d08bcbe5d92279386d9e059859af8488bb3b1