Merge "Base: Remove LOG_S variants."