Import translations. DO NOT MERGE am: aa73b0a72f  -s ours
am: de0dfa5204  -s ours

Change-Id: I9f514978d29e2062e6b1ef552fe80479097bec07