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