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

Change-Id: I4cf484713b16bed3b1885b4cbe3d78525acaa986