Merge "Doc change: add trademarks attribution." into jb-dev