Pass phpcs-strict on some test files (1/x)

Change-Id: I7f8dee09ac734cbc369441431841f2d4aa5d7f51
Pass phpcs-strict on some test files (2/x)

Change-Id: Ia39fd107a554206927652b6e168faa0da501b362
Merge "Pass phpcs-strict on some test files (1/x)"
Merge "Pass phpcs-strict on some test files (2/x)"