Fix CodeSniffer errors

Change-Id: If38ee6271eae1eba68bde2260643a69d088f5203