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

Change-Id: I416874fe5e5440dc9a1a8fc89e84ab7f34638153