Merge "Remove non-localized message" am: ddbd256954
am: 70a09c00e5

Change-Id: I19c34a0ee59615ef8bf4d70fbeff993404929a57