Merge \\"More thorough cleansing of expired users\\" into nyc-dev am: 4f2b1b455e
am: c5ffdb9ee4

Change-Id: I8c7bec8db8d0f9271e965fcef079e778b04409e7