Documentation cleanup in Content-related files

Mostly extracted from I979e2438.

Change-Id: I6562d111c15425957eaaad31ded175811d7abf1c
Merge "Documentation cleanup in Content-related files"