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

* commit '2d43dd3c0e49776589cb21bfbf9b3860623d0bfc':
  DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.