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

Change-Id: I87a798d992e2fbcb7323f1e0c1644c8963fdefd5