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

Change-Id: Ibfdc04ee71c85b3923bb3996b2150fe3637d1553