Merge "Mark strings with incorrect contents as deprecated"