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

Change-Id: Ic720f91a2e7b257fe55c12403a5b5c6bef171624