Merge "Update cinder policy management"