Merge "Use Policy Translator abstract class"