[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 6670b2287a -s ours
am: e57adcce2a -s ours
am skip reason: subject contains skip directive

Change-Id: I35b8d1f2960bc4dcf018e39e1bd890d837f834bf