[automerger skipped] Import translations. DO NOT MERGE
am: 6e9b71e1d7  -s ours

Change-Id: Ia2dea698b25f0c180a3313b9f0cc58d00ffcdb6a