am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.