Merge "InternalNetworkManagementException Changes"