Merge changes from topic 'wakelockTotalDuration' into oc-dev

* changes:
  Wakelock durations are 0 instead of -1 if unused
  Added actual (unpooled) partial wakelock times.