Merge "Mark strings with incorrect contents as deprecated" am: 3a4addba4b am: 04af2e4f80
am: 44c9f535e1

Change-Id: I76160b258170ae42fb340a4d30e1f35d6d8b8b45