Merge "CtsNetTests: Add a test for b/25624963"