Merge "Mark TestNetworkManager as module API"