Initial blueprint for content type enforcement

Updated to address comments.

Change-Id: I726a55344f38eb9797991acd0d4caec004aecdd6
Merge "Initial blueprint for content type enforcement"