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

Change-Id: Ie2811824ad02d9518c8e1ef534c062b21bf6038a