reverted clock related changes from previous commit to fix build

Change-Id: Ic71cbfcaef1a01100869a4771cc53e3590c7f464