Merge "Address nit in NetworkStackUtils"
am: 076317a01f

Change-Id: I02e6eebe06875a8b07f3eac55fa8838757177c32