Update from upstream

Includes the change of all i18n files to Unicode encoding.

Change-Id: I0529696fe541f40c9cdcf8589c9e6b717a921ff9