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

Change-Id: I7bb24bbabf2ede3d27ab2789631bb0bb10a01d25