Fix phpcs warnings

Change-Id: I1d79f72b7b3e82823df76b77e2a2115595ca088f
Merge "Fix phpcs warnings"