am 9ee17b7d: am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread

Merge commit '9ee17b7dec7c76830b5add29f3b97039e178629a'

* commit '9ee17b7dec7c76830b5add29f3b97039e178629a':
  Usage Stats: don't block writing stats to disk.