Merge "Reapply "Add LocalNetworkConfig"" into main