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

Change-Id: I7ef1a8d56ebe123e19f2913c13324bd52ac08de2