Remove reference to entity content and improve special page comments

Change-Id: I57d68da3d62d0a565a01cf1246666d7c09041aa7
Merge "Remove reference to entity content and improve special page comments"