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

Change-Id: Ic04eb3e834c31033d6f4c25983a252b1d48f3a82