Merge "Technical debt paydown: clean up repeated string constants"