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

Change-Id: I95e89ac0defcc969fe92d5cae0a741dfb700596d