Merge "Remove high-overhead low-signal trace section" into nyc-dev
am: a2c10caef2

* commit 'a2c10caef20bbdb447844c09a822073fd0c9d62f':
  Remove high-overhead low-signal trace section

Change-Id: I87bf1c40d1f0ea392accf8a6c7b2ef82636dedf7