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

Change-Id: Ia5388c84b89cdabefe666b483cebe40066e4d26a