Merge "Mark strings with incorrect contents as deprecated"
am: 3a4addba4b

Change-Id: I76da2baee8fb1d3e26ba60d39b40f567ada04339