Merge "Address nit in NetworkStackUtils" am: 076317a01f
am: df598dc827

Change-Id: Ide4741305724a9e0d26305f8406c5445f9de12b3