Merge "Add instant and ABI XML tags for hostside networking tests."
am: 75c73cda26

Change-Id: Ibff6db948fe3a8ada9da6ac5bca334e85a75e4d9