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

Change-Id: I69f17bf2af45f03274fdb38853184880e46c3514
Pass phpcs-strict on some test files (10/11)

Change-Id: I5624292143fcabe890779f5095eae735d7afb176
Pass phpcs-strict on some test files (11/11)

Woo!

Change-Id: I9fc116dfdf18c2772d047adb5bb14535d0bd39ed
Merge "Pass phpcs-strict on some test files (9/11)"
Merge "Pass phpcs-strict on some test files (10/11)"
Merge "Pass phpcs-strict on some test files (11/11)"