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

Change-Id: I1bce66b314ef2789908faabd00c10e4da2c2bddc