Merge "Docs: Replacing "Developer" with "Manufacturer""