Merge "Protect vs unordered results in TrunkTestInheritJSONBase"