[automerger skipped] Import translations. DO NOT MERGE
am: 1f6344b270  -s ours

Change-Id: I5c53b1c13f1e88fd600ddda505728c2c39f90d5a