Merge "tombstoned: allow intercepts for java traces."