Fix CodeSniffer errors and warnings on some API classes

Change-Id: Id5fd7180f3a1d62663f79b27ad5108062607596a
Merge "Fix CodeSniffer errors and warnings on some API classes"