[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 158e38c3ed  -s ours
am: e80901e137  -s ours

Change-Id: I6b6384719002e1cc7f3616be1515b300156c8de6