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

Change-Id: I44f36854a22d60e3006e1cf84aa0f6ccb2c51cc4