[automerger skipped] Import translations. DO NOT MERGE am: d9bd267146  -s ours
am: 170d5415bc  -s ours

Change-Id: I5adca8586469006ca8b38f0849335d2a9325658a