Merge "Revert "Revert "Delay initial accept() until server initialized""" am: 551130fc2b

Change-Id: I8451b3e2fcdf4261d004befd4c9ba457cd237e8b