Clock finished

Change-Id: Ie5c8adff1c06656ec4f748d84491d5249d514e3d