[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 992d47a237  -s ours
am: 601a2d4470  -s ours

Change-Id: Ifffbc7c8bc83312644ff3cd80c95939a4885358a