Merge "Improve test coverage of ApiComplianceChecker"