Merge "Disable tracing from Zygote" into jb-mr2-dev