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

Change-Id: If37732c5b36e2052cb27dc7eb80a8406b2473412