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

Change-Id: Idf5272a3ccd1dab43d7b088893559f117d42ae0b