Merge "Documentation cleanup in Content-related files"