Merge "Merge "Fix NetworkStackTests." am: e4d640b3a8 am: ab98e503be" into pi-dev-plus-aosp