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
* commit '6915d809':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.