Merge "Fix NetworkStackTests." am: e4d640b3a8 am: ab98e503be
am: f6e7cb2caf

Change-Id: Ie02b6f9d464570bfa7c79c84ca34ab2ad9b46718