Merge "Enable agent attaching during live phase"
am: f35843dc6a

Change-Id: Ic8c6e3d5c1b3695187767bf31d2839e3395b9740