Attempt to fix missing clock sometimes

Change-Id: I2b82913d6f534513cbe8e55b843c645bb0d5264a