Merge "Make UsageStats tests more robust." into lmp-mr1-dev