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

Change-Id: If69a7ed5781c2bb9e6315534e03d263ebdcf2a50