Center clock fixes

Change-Id: Ie882a8dbe073a0668dd31cc9451746699c2c0c2d