Merge "Policy types schemas should only be parsed once"

No match.