Merge "BaseIDevicePolicyManager cleanup."