Fix CodeSniffer errors and warnings

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