Fix CodeSniffer errors and warnings on yet more API classes

Change-Id: I67739a0b7c456f3684abea84833753e79a485c07
Merge "Fix CodeSniffer errors and warnings on yet more API classes"