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

Change-Id: Icefd7660072aedb963fe3082ec40fb8ffcfd6286