Merge "Adding network api xml support"