Merge "Add gateway in network_info and share network API"