Merge "Fix counting problems in StopwatchTimer." into oc-dev