[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: 5a1b1a1b79 -s ours
am skip reason: subject contains skip directive

Change-Id: I686bc08b8f6fd2757442bd4d5489eee0c80db498