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

Change-Id: Iddece47182ff08386f7bcaa402c74eeaca57a693