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

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