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

Change-Id: I892987708bfee1106a09f10252ac5eee9bbf1a87