Merge "CommonTimeManagementService: fix error-prone warnings."