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

Change-Id: Iadba8c3280850fa297d98044b4a752cafa08236e