Merge "Replace Slog with Log in ContentProvider"