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

Change-Id: I9ee3214dbf971256733484b26cd18fb058077ac4