Localization update from upstream

Change-Id: I9ac867e8b54b63119acf213e82f3171e7dee32fc
Merge "Localization update from upstream"