Merge "Remove AM/WM traces" into nyc-dev
am: a1c8cfe0ac

* commit 'a1c8cfe0ac974b14829ea09d7dc66c186820d29f':
  Remove AM/WM traces