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

Change-Id: I8d286072e6ee6db15a92ed6b75321cc4cb30526e