Merge "Move NetworkUtils used by NetworkStack" am: b8bbc48dee
am: 4c5b40e084

Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc