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

Change-Id: Iaa2b33c203260e5684b317d50a07f5044762b9a1