Merge "Refactor policy parser init so that validate service is in helper"