Merge "Update clock location" into sc-v2-dev