Bug 909386 - [Clock] Refactor Stopwatch API