Make phpcs-strict pass on includes/ (7/7)

Change-Id: Ia9baaf0b3cdbe1a3c6b50ef8c4fe86fead88f909
Merge "Make phpcs-strict pass on includes/ (7/7)"