[automerger skipped] Merge "Detect NetworkStack path in rollback test" am:...
[automerger skipped] Merge "Detect NetworkStack path in rollback test" am: 5d4d3c17 am: 879655bc
am: 4c636390 -s ours
am skip reason: change_id I1788e323f763ca88b69b082f38078bee3bfe480d with SHA1 ce4cad87 is in history
Change-Id: I12263ca90577bf4a97691db1afa619643e823040