Merge "Fix Policy action "get_flavors" not found"