Make phpcs-strict pass on includes/ (6/~10)

Change-Id: I566183b5d660a55bb3b2aa7186aaed5355ead2c6
Merge "Make phpcs-strict pass on includes/ (6/~10)"