Merge changes I88273490,Ide518edc

* changes:
  Remove some instances of using NEM
  Make NEM spammy with new pipeline enabled.