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

Change-Id: Ifd646c19c8191214e009c07b0899c3daf1e06b88