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

Change-Id: Id77cc2323c1f255cd9652c7997e1c867b9e5915b