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

Change-Id: Iaa4a0c56345b4ba8f1f77f5a43f4f5cc6ef1823d