Merge "Fix CodeSniffer errors and warnings on yet more API classes"