Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev am: 87587fbda2
am: 0cbfb82f38

Change-Id: I7c7876d9fe871178be0918f0c8c48218527a18e0