[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: d1eb0c0d91  -s ours
am: 155666ea01  -s ours

Change-Id: I0bfffda3cb2120494da3c8e0114a0a4e19565022