Address CodeSniffer errors and warnings

Change-Id: Ie119db7d6d9e9eb3c1cd9c07b8f84fd155847c62
Merge "Address CodeSniffer errors and warnings"