Fix a few more CodeSniffer errors and warnings on some API classes

Change-Id: I119be629d8c8811d08413751bcffc0ce403cc2bd