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

Change-Id: Icdf0d6ccc7853a60420134194688ceef8800154d