Merge "tombstoned: Improve message on java trace completion." am: 111f351762
am: 91492a56ca

Change-Id: I8eef67d2cca8370836bdfa1a246da19769edabf3