Import translations. DO NOT MERGE am: 6122b957f9  -s ours
am: 0e76e18f3b  -s ours

Change-Id: I3b66de14394597d13907e63ab9158a195f712599