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

Change-Id: I156b547b504e7267ea43deff4b8c532635508e81