am 87aa4b25: am a1467911: Import translations. DO NOT MERGE

* commit '87aa4b2568e53fe0ebe60507bdf61c5c55f5e5a0':