Merge "Camera VTS: Fix incorrect return value check" into tm-dev