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

Change-Id: I160dfe72652f300a5e1bdf836d53d75bc26e9e1b