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

Change-Id: Ia976e9f7617c6ad5bceb5546bee9fd87d8ffdd84