Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev