Merge "Make stand-alone Policy environment"