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

Change-Id: If53c0bcb77606f53a602da3ecb4c8e262ee25141