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

Change-Id: Ide9a8e9f070e364acd770260a2c231ba0bc9a61c