[automerger skipped] Import translations. DO NOT MERGE
am: 7a4bca2451  -s ours

Change-Id: I4609036f1d4c08b2e0291fd63f2c6f99decf4446