Stopwatches cleanup

Change-Id: I1c5da295fce7ab74e82dec30800431175de1cf3d
1 file changed