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

Change-Id: I749faeb30ac1fa39c8219e7b88eb171080555239