Merge "Fix Automated API Review issues."