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

Change-Id: I4543024a1029fde612975e144e9c6a1f0cc09247