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

Change-Id: Ifc9f2278c7497f357b7db82ed27e6083351bf84b