Merge "Reduce timeout for DUMP NETSTATS PROTO"