[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 167b451daa  -s ours
am: 61f5ff3143  -s ours

Change-Id: I3765266bc79f4c4b1921d9574f0acf3c054c174a