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

Change-Id: I589b2ca6ac0a1562969ec4aeda1a8a4a60660814