Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats...
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am: 516ac154 -s ours
am: 4d93d122 -s ours
* commit '4d93d122':
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files