Merge "Update NetworkStackTests for jarjar usage"