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

Change-Id: Ia5f24099f9e41100e0b718b5b9d1fa8e8fd8c56b