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

Change-Id: I8453b97e5613f6df37efef1c352243706bced528