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

Change-Id: I9ad58b88d045eeea97154b20b6784660f8b86120