Merge "Fix counting problems in StopwatchTimer." into oc-dev am: eca0d421d1
am: 7b6128e54b

Change-Id: Ia62252b2198a00d1065fc5c1a28af20ed481ba79