Localization update from upstream

Change-Id: I3ffc4214dafec7517a13cd52ef9aa3eb592717bc