Merge "Minor improvements on DevicePolicyManagerService."