Merge "Add default policy for Gnocchi"