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

Change-Id: I1ec715a6d39579677b8cd40996a48bf6fdd13a71