[automerger skipped] Import translations. DO NOT MERGE am: 44f20dde53  -s ours
am: 27fc82a83b  -s ours

Change-Id: Iac48770e3cecbf94d5cedaf998cb513d22758203