Merge "[FUI15] Remove networkId in NetworkState"