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

Change-Id: I2b826bf50346d97d681ffda0c575ed5338aeaa8e