Remove some instances of using NEM

Test: Manual w/ new pipeline
Change-Id: I8827349070d8650262e392f73343b2fa8bf1d41a
1 file changed