Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev