Merge "Add SystemConfigTest to presubmit"