temporarily track our LockClock until build failure is resolved

Change-Id: Iab3feaa96cda5363150fd9859d9b48f9f2692b98