Import translations. DO NOT MERGE
am: 30b5edfd23  -s ours

Change-Id: I8e401e5b1cdfa7506384c1aeab219697360bcf79