[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: 20add0a4c6  -s ours

Change-Id: I47082d4c5849c2a6ec801027bcb204a61a1e14bc