Merge "Use constant type instead of nf-role in naming policy"