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

Change-Id: Ie476fe6bdac8ec324936a406a57c6cc38251f96e