Pass phpcs-strict on includes/upload

Change-Id: I80eaa22398227a4edb7160d560b625102c7436ac
Merge "Pass phpcs-strict on includes/upload"