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

Change-Id: I69e2bca3c98fe9d3713c852699f49b7b4c868338
Merge "Pass phpcs-strict on maintenance/ (2/8)"