Merge "Update how UsageStats timestamps are written to disk." into rvc-dev am:...
Merge "Update how UsageStats timestamps are written to disk." into rvc-dev am: abe10376 am: 5693a1d5 am: 0a575c7e am: 411c8cfc
Change-Id: I0e69e0be527a13bbdfed3b8a44cec27f037d75e8