Import translations. DO NOT MERGE am: 48cf1d9768  -s ours
am: 829d7186d5  -s ours

Change-Id: Icf5cedc770c63dc8e5e41cb128d01135fe1596bf