[automerger skipped] Import translations. DO NOT MERGE
am: 0edea4caec  -s ours

Change-Id: I6c4f3bea431c06a4f9e0d843a752f1ecb8eac0f0