Merge "Add an extra for the logo uri to DevicePolicyManager."