Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many...
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am: 6915d809 -s ours
am: 2d43dd3c -s ours
* commit '2d43dd3c':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.