Merge "Fix support library docs for unbundling" into nyc-dev