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

Change-Id: I9509718df32c23d4cf5dc101385e29b5ec7e12b4