Merge "SystemConfig: Allow runtime differentiation of vendor configurations"