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

Change-Id: Ib9ee255740681f0d32d76b75ef33b369bc87bcc1
Merge "Pass phpcs-strict on maintenance/ (4/8)"