[automerger skipped] Import translations. DO NOT MERGE
am: 31161dba35 -s ours
am skip reason: subject contains skip directive

Change-Id: I5ca71a602c280cb05ed5b1b490a78987ccf1dd73