[automerger skipped] Merge "Add agent startup-attach" am: 2214ede1ec -s ours am: ae856b049a -s ours am: 1d7b2e472c -s ours
am: a6afc752b0 -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 ca8502a7f5 is in history

Change-Id: Ibd45b1d63fa138e60abb9fb360af2d5ac78519ba