[automerger skipped] Import translations. DO NOT MERGE am: 40ac4a061c  -s ours
am: df6b09dbe7  -s ours

Change-Id: Iec5a6f4ebc28911678b5bebc76e6e8342d74d136