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

Change-Id: I9f6040fb97c55aa5e01d00d5221a2c678227dab2