Merge "Address errors and warnings in CodeSniffer in api/"