Pass phpcs-strict on maintenance/ (1/8)

Change-Id: Ib68a7cf4251e8f4c71233df869673f4c5d3cf84c
Merge "Pass phpcs-strict on maintenance/ (1/8)"