Merge "Add hidden utils and constants to NetworkStack" am: 567cc7890a
am: 7bd6398634

Change-Id: Iac0cb991653c5556c219dbed802758a32dc1b63b