Merge "Don't touch usage stats before system ready" into nyc-mr1-dev am: 3462c194db
am: 14890673be

Change-Id: I2b96d38e6963f614c85b0425182e789b494ed265