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

Change-Id: I419343c0b24eeb5973435be1496806cbcb883bb4