Merge "Split ApiUsageException and UsageException to class per file"