Merge "Camera: Support vendor tags from multiple providers" into oc-dev