Pick up the latest changes from legal-docs
Merge pull request #2241 from kyoshino/update-legal-docs

Pick up the latest changes from legal-docs