am a80ddadf: Merge "remove NV_WAR defines"

* commit 'a80ddadf037e491c997b17da58ea08219eb21bd7':
  remove NV_WAR defines