[automerger skipped] Fix NetworkStackCoverageTests on Q am: af558386 -s ours...
[automerger skipped] Fix NetworkStackCoverageTests on Q am: af558386 -s ours am: 2e5f0b7d -s ours
am skip reason: Change-Id I3ae98e24a542c6313e06bcc787ad5a0a2a1db723 with SHA-1 905b0b64 is in history
Change-Id: I2c29808eeb381b4af0e80718e90200ff78001403