Merge "Fixing policy file after code change"