Merge "CtsVerifier / Camera FOV test: Fix warnings from checkstyle.py" into sc-v2-dev