Fix PHP CodeSniffer errors and warnings

Change-Id: I573d73b4cf1dcddfe14e9d565e4f170ad024ea31
Merge "Fix PHP CodeSniffer errors and warnings"