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

Change-Id: I938bcab98492d870e6d8a924f3541a8e65468a10