Merge "Remove CommonClock / CommonTimeManagementService"