Merge "Camera: Initial support for vendor tag caches" into oc-dev