Cleanup namespaces and code style issues in content classes.

Change-Id: Id20201c4e5c4edb08dc8038668365dad343fafa3
Merge "Cleanup namespaces and code style issues in content classes."