[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 819efdf5e6  -s ours
am: 7c152d8457  -s ours

Change-Id: I59291cf08ddce612b79ebcafe7a7b0c579d3f709