Pass phpcs-strict on some test files (7/11)

Change-Id: Ia0ceea60e7ef43959f868378f3fcd463a3adf782
Merge "Pass phpcs-strict on some test files (7/11)"