Merge "Move the automatic namespace outside of the res namespace."