Commits
Amith Yamasani authored and Joe LaPenna committed 481a343d328
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files Bug: 25355086 Change-Id: I65946e5afa841215f161fc25ad70b31a108a33c3 (Cherrypicked from ccf7d9e8ce11fd44e5b70b375ce25bed93e7153c)