Import translations. DO NOT MERGE am: 3739f191c2  -s ours
am: cd341ba7dd  -s ours

Change-Id: Idb51f0fbc0a25421f148d574b9498702e50f12e0