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

Change-Id: Ibfd8a97f9888194d0cc1a5a679f790c910cbe119