Merge "Log non-fatal RS errors."