Merge "Address CodeSniffer comments in ApiBase.php"