Merge "Lights: parameterized VTS tests." am: 8028a27e66
am: 7e83072833

Change-Id: Ia8d7f0d542de2b526a13c7b78f1ad760b183feac