Merge "Camera: Fix error handling for reading in vendor tags" into nyc-dev