Merge "Revert "Modify metadata provider to support query other tables.""