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

Change-Id: I26f443f65b513b608b4d07853345487d3fc77845