Merge "[automerger skipped] Merge "Detect NetworkStack path in rollback test" am: 5d4d3c178f am: 879655bccc am: 4c636390c7 -s ours am skip reason: change_id I1788e323f763ca88b69b082f38078bee3bfe480d with SHA1 ce4cad87d2 is in history"