Merge "Detect NetworkStack path in rollback test" am: 5d4d3c178f
am: 879655bccc

Change-Id: I171965c0caf6fdd54a1a6031b25248e19e8a648b