Import translations. DO NOT MERGE am: 34e2854786  -s ours
am: 93d2e08ef2  -s ours

Change-Id: Icfba2b987aae40dd9f9cebfb7299cc5319d4bc68