[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 915d04b422  -s ours
am: 2819360abd  -s ours

Change-Id: Iff447d49f0e1d9ff89904b08ee3bd76cf7b62cb5