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

Change-Id: I669d80114ed83231205da0a608ee8e7cdfa8956c