Merge "SystemConfig: Allow runtime differentiation of vendor configurations" am: 8629072a6f

Change-Id: Ic058ebe60981b180ae68a440ed37207c46ffc791