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

Change-Id: If0f9a401c535549f98c656e23bc252365389e597