Merge "Remove 2 unused private fields from ApiFormatBase"