Update from upstream

* Localization updates.
* Solution for bug 54725

Change-Id: I91f8263c49fdfba3084f2b3107a8b57963fd720d
Merge "Update from upstream"