[automerger skipped] Import translations. DO NOT MERGE
am: 2aaa71af5f  -s ours

Change-Id: I42c619beb67f49a619d84464052ee79841c93f3c