Merge "debuggerd: advance our amazing bet." am: 230201dcbf am: 9630532851
am: 47d1db0940

Change-Id: I24db057040dc12487cf7b8763fd83272372588f4