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

Change-Id: I7017ca9abd2c981606a81c6046ef41333ac352a8