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

Change-Id: I11fa3ed3152f4ccf3af29db09bf59df7c5f0c204