Merge "Use the new 'partition' field in 'ApexInfo' to identify vendor apexes" into main