Pass phpcs-strict on includes/specials/ (2/3)

Change-Id: Ide979e5b948115afcec59d929516411c2e8346ae
Merge "Pass phpcs-strict on includes/specials/ (2/3)"