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

Change-Id: I39ebf474a37b7d2beec08ae99384d7d2ee333fc1