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

Change-Id: Id98cdb39db82f8e26a7414cfb306880e468aa5e0