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

Change-Id: Ibfd8a97f9888194d0cc1a5a679f790c910cbe119