Update from upstream

Only localization. Adding hak.

Change-Id: I3998902792a36631aeba64418b4f49176f03ebe4
Merge "Update from upstream"