am 95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev

* commit '95a869f91bb9ab24300cec37037b0edcfa54f334':
  Disable tracing from Zygote