Final GClock changes

Change-Id: If33f9896106c58a627216090440080f051b197db
Signed-off-by: Parth Satra <pasatra@ncsu.edu>