Merge "Fix tests for snapshots extended_snapshot_attributes policy"