Merge "Move StopWatch class into common."