Merge "Update clock burn-in so it doesn't clash with udpfs" into sc-v2-dev