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

Change-Id: Iae4f0d1b5bc6a3816df2449792867cc14e36829f