Merge "Minor improvements on DevicePolicyManagerService." into sc-dev