Fix infite loop in user stats

Change-Id: Idf72f49b3c6f9551d015a2ba97fc4b8f0efa16f6
Merge "Fix infite loop in user stats"