Merge "Perform agent startup-attach before bind" am: 7ae1299cdd am: d3337c9051 am: b49226d0be
am: a10ebfaa56

Change-Id: I3bc2422269baebdfe9a9a8aa2894b12c4dfe5586