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

Change-Id: I1a23e449d95ddc61aafcb3746bc79f6b734ddbef