[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 3c53bd0636  -s ours

Change-Id: I8de98bbc5b4b7bc4a7158d3c9381b6ce2405af78