am 2abeceb7: am a80ddadf: Merge "remove NV_WAR defines"

* commit '2abeceb76408d8645836b3efe274de8c0c5b5d2d':
  remove NV_WAR defines