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

* commit 'd023da1fa9ea0d7deab38f8cf0be6a60e901dfb7':

Change-Id: If9a95f39254fc26009d8ff0ecf5a9502c0901bc6