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

Change-Id: Ib56f83980f2a63e574bcbfd97b21b816fa12d3aa