Make languages/classes pass phpcs-strict

Change-Id: I0985f3c7e4b36338c68a4a63cfba4eaa4af567c0
Merge "Make languages/classes pass phpcs-strict"