Fix phpcs errors & warnings

Change-Id: Ib978bc6c269239e05986a656f798bb145fc950ca
Merge "Fix phpcs errors & warnings"