Import translations. DO NOT MERGE am: f4123b8073  -s ours
am: 66f4eda45f  -s ours

Change-Id: I5095a001bed6e84a0a981e23be6be0cf92e5484d