Merge "tombstoned: turn on java trace support + unit tests." am: 3aaf17fc16
am: dcb4b80694

Change-Id: I209fdf87135d88468bc37f102710078ffe871bdc