Merge "Add change marker for added method in SocketFactory"