[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 72ecec0909 -s ours
am: e3710a3624 -s ours
am skip reason: subject contains skip directive

Change-Id: I06f61c1567174b6b15dd1b509a55521ca776b544