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

Change-Id: Ia76f70bfbe6eb8b29ac50de3ce08c36a5941b04d