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

Change-Id: Ib9f2f8a6631c4eaf7cca7688379393216aa681c2