[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: c2f735b844  -s ours
am: 3d87fa503d  -s ours

Change-Id: If556e6f195e2d80d576052c35847722800aac807