[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: b3581e7602 -s ours
am skip reason: subject contains skip directive

Change-Id: I09840927198a83c3c0b12729f47337fd223c2c3e