Merge "tombstoned: allow intercepts for java traces."
am: 1e63347425

Change-Id: I326308ed1fa4bdbb3380a19403fecb93386ec811