Merge "Suppress self-assign-overloaded warning for tests"