Merge "Camera: Provider: Set up vendor tag before getDeviceVersion"