Merge "BaseIDevicePolicyManager Q cleanup."