Merge "Delay initial accept() until server initialized" am: 0e42b0f2b6 am: fab2f5a633
am: 771221706a

Change-Id: Icdf0d6ccc7853a60420134194688ceef8800154d