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

Change-Id: Iac3bc0429f85bd986816cad14516da593585a06c