[automerger skipped] Import translations. DO NOT MERGE am: 7288a72ef6  -s ours
am: 471e2c285e  -s ours

Change-Id: I89f768c54a6935b7b484c17a2321054f33e7434e