Merge "Revert "Delay initial accept() until server initialized"" am: 5fff3877a1
am: 4443254774

Change-Id: Ia976e9f7617c6ad5bceb5546bee9fd87d8ffdd84