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

Change-Id: I0c5ed4791574cc30ed3f10c3a782fe7f9e88332b