Merge "Add interface name for proxy network type." into klp-modular-dev