am 8bd44306: Merge "Set default tracing categories"

* commit '8bd443063b4a981a0db0307f4dcfc038e1a7671d':
  Set default tracing categories