Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am: 516ac154e1  -s ours am: 4d93d122bd  -s ours
am: 76e30f26af  -s ours

* commit '76e30f26afe9b5971028ce10353da5f760f6738a':
  DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files