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

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

Change-Id: I26b96da6906374c7ed86b93d8e0594a2e7066f9d