Merge "Make declaration of ApiFormatRaw compatible with ApiFormatBase"