[automerger skipped] Import translations. DO NOT MERGE
am: 978f6e037e  -s ours

Change-Id: I997d8463512934c0e86ddeca417cc9425121f1a8