Import translations. DO NOT MERGE am: 149b6ede65  -s ours am: f4561d90dc  -s ours
am: c2574b9ba6  -s ours

Change-Id: I5846a654d802435a00cdb0e8b034ff2111fbb8be