Also change some hardcoded network config to dynamic Change-Id: I5dc1df89b32436a41cf7d7c46e30be879207b224