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

Change-Id: I9fc9f0daa019ce8110154d8ede8f269b7d3bfea9