[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7c862d461c  -s ours
am: 474c7891df  -s ours

Change-Id: I559909d91a34adaaa61830a6ae6b23e2e5658556