Fix CodeSniffer errors and warnings

Change-Id: I35cf9a9a86f0643896b30d6f4d976177e6cba4d9
Merge "Fix CodeSniffer errors and warnings"