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

Change-Id: I4baa47ae5c1f162d176e21577fe7599485e90f3d