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

Change-Id: I453ecc474139c7a5f1d0d20306ad28c2cee80ec9
Merge "Pass phpcs-strict on maintenance/ (3/8)"