Merge "Update MetadataDatabase to match renaming priority to connectionPolicy"