Merge \"Ignore stopped/deleted users when filling cache.\" into nyc-mr1-dev
am: 0711adc84d

Change-Id: I52ffba44227224a0ca96ed4981fe94f299f77e9d