Merge "Use adds instead of add to set the N flag." am: 25633b09df
am: 17d6617727

* commit '17d6617727250aad1d85d441d2db18037bb2382c':
  Use adds instead of add to set the N flag.