Merge "Fix NetworkStackTests compatibility with Q"