Make sure content policy component is loaded.
Merge remote-tracking branch 'origin/master'