Merge "Doc change: remove intl/nn from collections paths." into nyc-dev