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

Change-Id: I03c34a8e17282a8e2e5a02fdee1132a829d55909