Merge "Don't touch usage stats before system ready" into nyc-mr1-dev