Merge "Add OsConstants networking constants to public API" am: 72373058ce
am: 78299407f3

Change-Id: I540e1b6a358a3eccc3313e114fa3b6473bd5681e