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

* commit '3c4b12ddaa8e82658fc38cb351f878058a2ffa90':
  Remove AM/WM traces