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

Change-Id: I40fc59c193077ee76cf2e1a47e8039ef08df123f