[automerger skipped] Import translations. DO NOT MERGE am: 971ceb6e23  -s ours
am: 623f2340fe  -s ours

Change-Id: I82b50937786d5b57ebeb4f5266c84f71f10fb33f