Merge "Camera VTS: remove duplicate function in anonymous namespace" into tm-dev